From: Boyuan Yang Date: Sun, 28 Jul 2024 23:40:12 +0000 (-0400) Subject: Refresh patches X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~26 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=0aa86a29a60bb0e38db7cb2a66826381ca7a8ee6;p=opencc.git Refresh patches --- diff --git a/debian/changelog b/debian/changelog index b353e63..64769aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ opencc (1.1.8+ds1-1) unstable; urgency=medium * New upstream release. * debian/copyright: Update information. + * debian/patches: Refresh patches. - -- Boyuan Yang Sun, 28 Jul 2024 19:38:09 -0400 + -- Boyuan Yang Sun, 28 Jul 2024 19:40:00 -0400 opencc (1.1.7+ds1-1) unstable; urgency=medium diff --git a/debian/patches/0001-use-cmake-install-libdir.patch b/debian/patches/0001-use-cmake-install-libdir.patch index 6743dca..a91c95e 100644 --- a/debian/patches/0001-use-cmake-install-libdir.patch +++ b/debian/patches/0001-use-cmake-install-libdir.patch @@ -4,13 +4,13 @@ Subject: use-cmake-install-libdir Update 2021-09-18: Also use GNUInstallDirs. -Last-Update: 2022-12-10 +Last-Update: 2024-07-28 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ee08591..46b3be9 100644 +index 3393613..6db5fa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ cmake_minimum_required(VERSION 3.5) @@ -22,10 +22,10 @@ index ee08591..46b3be9 100644 ######## Options option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF) @@ -82,7 +83,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) - set (DIR_INCLUDE ${DIR_PREFIX}/include/) - set (DIR_SHARE ${DIR_PREFIX}/share/) - set (DIR_ETC ${DIR_PREFIX}/etc/) --set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}/) + set (DIR_INCLUDE ${DIR_PREFIX}/include) + set (DIR_SHARE ${DIR_PREFIX}/share) + set (DIR_ETC ${DIR_PREFIX}/etc) +-set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}) +set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR}) if (DEFINED SHARE_INSTALL_PREFIX) diff --git a/debian/patches/0003-data-Explicitly-use-python3.patch b/debian/patches/0003-data-Explicitly-use-python3.patch index 2388a8d..2e4d3ac 100644 --- a/debian/patches/0003-data-Explicitly-use-python3.patch +++ b/debian/patches/0003-data-Explicitly-use-python3.patch @@ -54,7 +54,7 @@ index f7d4dc5..6ad6e8c 100755 import sys diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py -index 20d82fd..11bc4c9 100755 +index bd57ae7..c742413 100755 --- a/data/scripts/sort_all.py +++ b/data/scripts/sort_all.py @@ -1,4 +1,4 @@ diff --git a/debian/patches/0004-no-remote-images-when-reading-docs-on-disk.patch b/debian/patches/0004-no-remote-images-when-reading-docs-on-disk.patch index d1a2ae2..8a4c445 100644 --- a/debian/patches/0004-no-remote-images-when-reading-docs-on-disk.patch +++ b/debian/patches/0004-no-remote-images-when-reading-docs-on-disk.patch @@ -1,37 +1,29 @@ From: Gunnar Hjalmarsson -Date: Sat, 6 Mar 2021 17:45:20 +0800 +Date: Sun, 28 Jul 2024 19:42:55 -0400 Subject: Don't fetch remote images when reading docs on disk -Forwarded: no -Last-Update: 2021-09-18 - This fixes a privacy breach previously reported as Lintian warnings + +Forwarded: not-needed +Last-Update: 2024-07-28 --- - README.md | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + README.md | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md -index 7225e01..dbb7fb4 100644 +index e4edffb..cc22afd 100644 --- a/README.md +++ b/README.md -@@ -1,14 +1,14 @@ +@@ -1,12 +1,5 @@ # Open Chinese Convert 開放中文轉換 --[![Travis](https://img.shields.io/travis/BYVoid/OpenCC.svg)](https://travis-ci.org/BYVoid/OpenCC) --[![AppVeyor](https://img.shields.io/appveyor/ci/Carbo/OpenCC.svg)](https://ci.appveyor.com/project/Carbo/OpenCC) --[![C/C++ CI](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml) +-[![CMake](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml) +-[![Bazel](https://github.com/BYVoid/OpenCC/actions/workflows/bazel.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/bazel.yml) +-[![MSVC](https://github.com/BYVoid/OpenCC/actions/workflows/msvc.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/msvc.yml) -[![Node.js CI](https://github.com/BYVoid/OpenCC/actions/workflows/nodejs.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/nodejs.yml) -[![Python CI](https://github.com/BYVoid/OpenCC/actions/workflows/python.yml/badge.svg)](https://github.com/BYVoid/OpenCC/actions/workflows/python.yml) -+[[Travis](https://travis-ci.org/BYVoid/OpenCC)] -+[[AppVeyor](https://ci.appveyor.com/project/Carbo/OpenCC)] -+[[C/C++ CI](https://github.com/BYVoid/OpenCC/actions/workflows/cmake.yml)] -+[[Node.js CI](https://github.com/BYVoid/OpenCC/actions/workflows/nodejs.yml)] -+[[Python CI](https://github.com/BYVoid/OpenCC/actions/workflows/python.yml)] - +-[![AppVeyor](https://img.shields.io/appveyor/ci/Carbo/OpenCC.svg)](https://ci.appveyor.com/project/Carbo/OpenCC) +- ## Introduction 介紹 --![OpenCC](https://opencc.byvoid.com/img/opencc.png) -+OpenCC - - Open Chinese Convert (OpenCC, 開放中文轉換) is an opensource project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai). It supports character-level and phrase-level conversion, character variant conversion and regional idioms among Mainland China, Taiwan and Hong Kong. This is not translation tool between Mandarin and Cantonese, etc. - + ![OpenCC](https://opencc.byvoid.com/img/opencc.png) diff --git a/debian/patches/0005-Use-system-googletest.patch b/debian/patches/0005-Use-system-googletest.patch index 9a6da9d..2309815 100644 --- a/debian/patches/0005-Use-system-googletest.patch +++ b/debian/patches/0005-Use-system-googletest.patch @@ -1,21 +1,21 @@ From: Shengjing Zhu -Date: Sat, 6 Mar 2021 17:53:25 +0800 +Date: Sun, 28 Jul 2024 19:44:27 -0400 Subject: Use system googletest Forwarded: not-needed -Last-Update: 2022-12-10 +Last-Update: 2024-07-28 --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76c2b69..5f9cdcf 100644 +index 6db5fa1..fcdedeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -206,6 +206,8 @@ add_subdirectory(test) +@@ -231,6 +231,8 @@ add_subdirectory(test) if (ENABLE_GTEST) if(NOT USE_SYSTEM_GTEST) - add_subdirectory(deps/gtest-1.12.1) + add_subdirectory(deps/googletest-1.15.0) + else() + add_subdirectory(/usr/src/googletest/googletest ${CMAKE_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL) endif()